Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 06:21:55 +0000 (22:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 06:21:55 +0000 (22:21 -0800)

Trivial merge